From a8e2828cdab36b7fb85fc57f2e2c24c67bd37206 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 23 Oct 2012 12:39:36 -0700 Subject: [PATCH] * configure.ac (_FORTIFY_SOURCE): Do not multiply define. This ports to Gentoo. Problem originally reported against coreutils, but Emacs has it too. --- ChangeLog | 6 ++++++ configure.ac | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 495d39c0a3c..8dc0681b163 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-10-23 Paul Eggert + + * configure.ac (_FORTIFY_SOURCE): Do not multiply define (Bug#12714). + This ports to Gentoo. Problem originally reported against coreutils, + but Emacs has it too. + 2012-10-23 Glenn Morris * Makefile.in (emacs_transform): Remove. diff --git a/configure.ac b/configure.ac index 7104b9de170..4564bc3085e 100644 --- a/configure.ac +++ b/configure.ac @@ -743,7 +743,7 @@ else AH_VERBATIM([FORTIFY_SOURCE], [/* Enable compile-time and run-time bounds-checking, and some warnings, without upsetting glibc 2.15+. */ - #if defined __OPTIMIZE__ && __OPTIMIZE__ + #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ # define _FORTIFY_SOURCE 2 #endif ]) -- 2.30.2